🌱 Bump CAPI to v1.11 and k8s to v1.33 #5720

clebs · 2025-10-23T10:21:14Z

What type of PR is this?
/kind support

What this PR does / why we need it:
This PR bumps CAPI to v1.11.0, and k8s to v1.33.3.

Update all imports to v1beta2 types except for conditions staying in v1beta1.
Adapt source code to work with v1beta2 and deprecated conditions.
Manually update conversions.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #5593

Replaces #5624

Special notes for your reviewer:

Checklist:

Release note:

Bump CAPI to v1.11 and k8s to v1.33

k8s-ci-robot · 2025-10-23T10:21:20Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign ankitasw for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot · 2025-10-23T10:21:22Z

Welcome @clebs!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2025-10-23T10:21:23Z

Hi @clebs. Thanks for your PR.

I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

clebs · 2025-10-23T10:31:01Z

@richardcase This PR here based on @bryan-cox's: #5720

Changes:

Rebased the PR to main
Fixed missing/wrong go modules
Updated all imports to use the new v1beta2 API, except for conditions which stay on v1beta1
Adapted all the code to properly use the new types
Add adapters to use v1beta1.Conditions with v1beta1types
Manually fix converters for FailureDomains

Current state:

Code compiles
Generation fails because of manual conversions required
Working on linting issues

chrischdi · 2025-10-23T10:43:45Z

/ok-to-test

api/v1beta1/awscluster_types.go

api/v1beta2/awscluster_types.go

.golangci.yml

util/paused/paused.go

test/e2e/suites/managed/machine_deployment_helpers.go

controllers/awscluster_controller.go

controllers/awscluster_controller_test.go

raykrueger · 2025-10-23T14:53:58Z

test/e2e/data/e2e_eks_conf.yaml

Should we be bumping KUBERNETES_VERSION_MANAGEMENT and KUBERNETES_VERSION_UPGRADE_FROM to target 1.33 in this file?

pkg/cloud/services/ec2/instances.go

cnmcavoy

See my comment on the subnet filtering regression

api/v1beta1/awsclustertemplate_types.go

api/v1beta1/awsmachinetemplate_types.go

chrischdi · 2025-10-27T16:55:37Z

/test pull-cluster-api-provider-aws-e2e-blocking

- Update core Kubernetes dependencies from v0.32.3 to v0.33.4: - k8s.io/api, k8s.io/apimachinery, k8s.io/client-go - k8s.io/apiserver, k8s.io/cli-runtime, k8s.io/kubectl - k8s.io/apiextensions-apiserver, k8s.io/component-base - Upgrade prometheus/client_golang from v1.19.1 to v1.22.0 - Update cel.dev/expr from v0.18.0 to v0.19.1 - Upgrade google/cel-go from v0.22.0 to v0.23.2 - Update golang.org/x/time from v0.8.0 to v0.9.0 - Upgrade gRPC from v1.67.3 to v1.68.1 - Update OpenTelemetry packages to v1.33.0 - Refresh k8s.io/utils and other indirect dependencies - Update kube-openapi and structured-merge-diff versions

- Upgrade cluster-api from v1.10.2 to v1.11.1 - Upgrade controller-runtime from v0.20.4 to v0.21.0 - Update various golang.org/x/* packages - Update testing dependencies (ginkgo, gomega) - Update OpenTelemetry and other indirect dependencies

Signed-off-by: Borja Clemente <[email protected]>

- Update all imports to v1beta2 types except for conditions staying in v1beta1. - Adapt source code to work with v1beta2 and deprecated conditions. - Manually update conversions. Signed-off-by: Borja Clemente <[email protected]>

Signed-off-by: Borja Clemente <[email protected]>

Introducing v1beta2 on public types is a breaking change so they have to stay in v1beta1. Internally though, migration to v1beta2 is happening (except for conditions). Signed-off-by: Borja Clemente <[email protected]>

Signed-off-by: Borja Clemente <[email protected]>

k8s-ci-robot · 2025-11-04T17:12:00Z

@clebs: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-aws-test	`7dc9647`	link	true	`/test pull-cluster-api-provider-aws-test`
pull-cluster-api-provider-aws-verify	`7dc9647`	link	true	`/test pull-cluster-api-provider-aws-verify`
pull-cluster-api-provider-aws-e2e-blocking	`7dc9647`	link	true	`/test pull-cluster-api-provider-aws-e2e-blocking`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

chrischdi

Some notes:

I did not fully review the unit tests
Using the label constants from v1beta2 can be okay (as long as the consts did not change), so these decisions are only comments, I think up to the maintainers to decide.
- I started to add these comments but stopped later on.
As a follow up: all usages of v1beta1conditions should be reviewed (places where we set v1beta1 conditions on CAPI objects like MachinePool) and considered if we additionally want to set a v1beta2 condition

chrischdi · 2025-11-05T07:33:22Z

api/v1beta1/types.go

 	"k8s.io/apimachinery/pkg/util/sets"

-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"


This changes:

// Instance describes an AWS instance. type Instance struct { ... // Addresses contains the AWS instance associated addresses. Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"` ...

to use the v1beta2 struct.

The v1beta2 struct does now set "omitempty" so there's a change in marshalling behavoir.

My personal opinion on this is: keep using v1beta1 here, but up to the CAPA maintainers.

Impact of keeping v1beta1:
We'd have to convert

Just noticed, in CAPA v1beta2 we keep using clusterv1beta1, so we should also do the same here.

This must have been set back on the rebase... I went through all these on the public API.
Will do a more in depth verification.

chrischdi · 2025-11-05T07:34:10Z

api/v1beta1/conditions_consts.go

 package v1beta1

-import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+import clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck


Nit: Maybe worth adding to .golangci.yml that api/v1beta1 and api/v1beta2 are allowed to use that instead of adding the nolint everywhere.

chrischdi · 2025-11-05T07:38:46Z

api/v1beta2/awscluster_webhook_test.go

 	"sigs.k8s.io/cluster-api-provider-aws/v2/util/defaulting"
-	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1" //nolint:staticcheck
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"


Suggested change

clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"

We should be able to only use clusterv1beta1 here.

chrischdi · 2025-11-05T07:41:10Z

bootstrap/eks/controllers/eksconfig_controller.go

 	}

-	if cluster.Spec.ControlPlaneRef == nil || cluster.Spec.ControlPlaneRef.Kind != "AWSManagedControlPlane" {
+	if cluster.Spec.ControlPlaneRef.Name == "" || cluster.Spec.ControlPlaneRef.Kind != "AWSManagedControlPlane" {


Suggested change

if cluster.Spec.ControlPlaneRef.Name == "" || cluster.Spec.ControlPlaneRef.Kind != "AWSManagedControlPlane" {

if cluster.Spec.ControlPlaneRef.IsDefined() || cluster.Spec.ControlPlaneRef.Kind != "AWSManagedControlPlane" {

chrischdi · 2025-11-05T07:45:58Z

bootstrap/eks/controllers/eksconfig_controller.go

 	}

-	if !cluster.Status.InfrastructureReady {
+	if !meta.IsStatusConditionTrue(cluster.GetConditions(), string(clusterv1beta1.InfrastructureReadyCondition)) {


The replacement is cluster.Status.Initialization.InfrastructureProvisioned

Suggested change

if !meta.IsStatusConditionTrue(cluster.GetConditions(), string(clusterv1beta1.InfrastructureReadyCondition)) {

if !ptr.Deref(cluster.Status.Initialization.InfrastructureProvisioned, false) {

chrischdi · 2025-11-05T12:01:36Z

test/e2e/data/e2e_conf.yaml

            new: --metrics-bind-addr=:8080
-      - name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/core-components.yaml"
+      - name: v1.11.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.


Suggested change

- name: v1.11.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.

- name: v1.11.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.

chrischdi · 2025-11-05T12:01:49Z

test/e2e/data/e2e_conf.yaml

            new: --metrics-bind-addr=:8080
-      - name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/bootstrap-components.yaml"
+      - name: v1.11.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.


Suggested change

- name: v1.11.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.

- name: v1.11.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.

chrischdi · 2025-11-05T12:01:57Z

test/e2e/data/e2e_conf.yaml

            new: --metrics-bind-addr=:8080
-      - name: v1.10.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.2/control-plane-components.yaml"
+      - name: v1.11.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.


Suggested change

- name: v1.11.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.

- name: v1.11.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.

Note: the comment does not fit here.
As this releases is the v1beta2 series.

chrischdi · 2025-11-05T12:34:17Z

util/paused/paused.go

-func pausedCondition(scheme *runtime.Scheme, cluster *clusterv1.Cluster, obj ConditionSetter, targetConditionType string) clusterv1.Condition {
-	if (cluster != nil && cluster.Spec.Paused) || annotations.HasPaused(obj) {
+func pausedCondition(scheme *runtime.Scheme, cluster *clusterv1.Cluster, obj ConditionSetter, targetConditionType string) clusterv1beta1.Condition {
+	if (cluster != nil && cluster.Spec.Paused != nil && *cluster.Spec.Paused) || annotations.HasPaused(obj) {


Suggested change

if (cluster != nil && cluster.Spec.Paused != nil && *cluster.Spec.Paused) || annotations.HasPaused(obj) {

if (cluster != nil && ptr.Deref(cluster.Spec.Paused, false) || annotations.HasPaused(obj) {

chrischdi · 2025-11-05T12:34:43Z

util/paused/paused.go

+	if (cluster != nil && cluster.Spec.Paused != nil && *cluster.Spec.Paused) || annotations.HasPaused(obj) {
 		var messages []string
-		if cluster != nil && cluster.Spec.Paused {
+		if cluster != nil && cluster.Spec.Paused != nil && *cluster.Spec.Paused {


Suggested change

if cluster != nil && cluster.Spec.Paused != nil && *cluster.Spec.Paused {

if cluster != nil && ptr.Deref(cluster.Spec.Paused, false) {

chrischdi

Some notes:

I did not fully review the unit tests
Using the label constants from v1beta2 can be okay (as long as the consts did not change), so these decisions are only comments, I think up to the maintainers to decide.
- I started to add these comments but stopped later on.
As a follow up: all usages of v1beta1conditions should be reviewed (places where we set v1beta1 conditions on CAPI objects like MachinePool) and considered if we additionally want to set a v1beta2 condition
Also to fix fuzz tests: we now need to use randfill.Continue instead of fuzz.Continue.

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/support Categorizes issue or PR as a support question. labels Oct 23, 2025

k8s-ci-robot requested review from richardcase and serngawy October 23, 2025 10:21

k8s-ci-robot added needs-priority cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 23, 2025

k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 23, 2025

clebs mentioned this pull request Oct 23, 2025

🌱 Bump CAPI to v1.11 and k8s to v1.33 #5624

Closed

5 tasks

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 23, 2025